]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
FdoNotification: Highlight difference between icon/image and app-icon
authorJulian Sparber <julian@sparber.net>
Fri, 19 Jan 2024 18:08:46 +0000 (19:08 +0100)
committerMarge Bot <marge-bot@gnome.org>
Tue, 30 Jan 2024 17:05:23 +0000 (17:05 +0000)
This just renames the `icon` variable to `appIcon` to make clear that
this icon is considered to be the app icon.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3103>

js/ui/notificationDaemon.js

index 450989d7178b78df9bdc9cdf6e28556b9758fb86..c0cb8acff302dee552180327c231eed74b4c3b98 100644 (file)
@@ -136,7 +136,7 @@ class FdoNotificationDaemon {
     }
 
     NotifyAsync(params, invocation) {
-        let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
+        let [appName, replacesId, appIcon, summary, body, actions, hints, timeout] = params;
         let id;
 
         for (let hint in hints) {
@@ -162,7 +162,7 @@ class FdoNotificationDaemon {
 
         const ndata = {
             appName,
-            icon,
+            appIcon,
             summary,
             body,
             actions,
@@ -188,7 +188,7 @@ class FdoNotificationDaemon {
     }
 
     _notifyForSource(source, ndata) {
-        const {icon, summary, body, actions, hints} = ndata;
+        const {appIcon, summary, body, actions, hints} = ndata;
         let {notification} = ndata;
 
         if (notification == null) {
@@ -216,7 +216,7 @@ class FdoNotificationDaemon {
         let gicon = this._imageForNotificationData(hints);
 
         if (!gicon)
-            gicon = this._iconForNotificationData(icon);
+            gicon = this._iconForNotificationData(appIcon);
 
         if (!gicon)
             gicon = this._fallbackIconForNotificationData(hints);